bitkeeper revision 1.1108.33.34 (410e8c8d9bg1RHJ13Fqr_i-Yov0kRg)

fix merge botch

diff --git a/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c b/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c
index 658f7e267ebebd04fb2eec9a0f4f279865a7385c..c5d12db779a63ded86ce022967e321f9c3bcf7c6 100644 (file)
--- a/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c
+++ b/linux-2.6.7-xen-sparse/arch/xen/kernel/ctrl_if.c
@@ -122,10 +122,9 @@ static void __ctrl_if_tx_tasklet(unsigned long data)
 
     if ( was_full && !TX_FULL(ctrl_if) )
     {
+        wake_up(&ctrl_if_tx_wait);
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
         run_task_queue(&ctrl_if_tx_tq);
-#else
-        wake_up(&ctrl_if_tx_wait);
 #endif
     }
 }